From d0292f23b1a7df67b844bd2b328c84f7c36eac4f Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Fri, 5 Aug 2016 22:15:27 -0400
Subject: [PATCH] Remove unnecessary usages of `format!` macro.

---
 src/cargo/util/cfg.rs  |  2 +-
 src/cargo/util/toml.rs | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cargo/util/cfg.rs b/src/cargo/util/cfg.rs
index 95b20e508..fbdfb919e 100644
--- a/src/cargo/util/cfg.rs
+++ b/src/cargo/util/cfg.rs
@@ -215,7 +215,7 @@ impl<'a> Iterator for Tokenizer<'a> {
                             return Some(Ok(Token::String(&self.orig[start+1..end])))
                         }
                     }
-                    return Some(Err(human(format!("unterminated string in cfg"))))
+                    return Some(Err(human("unterminated string in cfg".to_string())))
                 }
                 Some((start, ch)) if is_ident_start(ch) => {
                     while let Some(&(end, ch)) = self.s.peek() {
diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index 9a7e2135a..6fe9e285f 100644
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -653,8 +653,8 @@ impl TomlManifest {
                                          replace,
                                          workspace_config);
         if project.license_file.is_some() && project.license.is_some() {
-            manifest.add_warning(format!("only one of `license` or \
-                                          `license-file` is necessary"));
+            manifest.add_warning("only one of `license` or \
+                                 `license-file` is necessary".to_string());
         }
         for warning in warnings {
             manifest.add_warning(warning.clone());
@@ -924,7 +924,7 @@ impl TomlTarget {
         match self.name {
             Some(ref name) => {
                 if name.trim().is_empty() {
-                    Err(human(format!("library target names cannot be empty.")))
+                    Err(human("library target names cannot be empty.".to_string()))
                 } else if name.contains("-") {
                     Err(human(format!("library target names cannot contain hyphens: {}",
                                       name)))
@@ -940,12 +940,12 @@ impl TomlTarget {
         match self.name {
             Some(ref name) => {
                 if name.trim().is_empty() {
-                    Err(human(format!("binary target names cannot be empty.")))
+                    Err(human("binary target names cannot be empty.".to_string()))
                 } else {
                     Ok(())
                 }
             },
-            None => Err(human(format!("binary target bin.name is required")))
+            None => Err(human("binary target bin.name is required".to_string()))
         }
     }
 
@@ -953,12 +953,12 @@ impl TomlTarget {
         match self.name {
             Some(ref name) => {
                 if name.trim().is_empty() {
-                    Err(human(format!("example target names cannot be empty")))
+                    Err(human("example target names cannot be empty".to_string()))
                 } else {
                     Ok(())
                 }
             },
-            None => Err(human(format!("example target example.name is required")))
+            None => Err(human("example target example.name is required".to_string()))
         }
     }
 
@@ -966,12 +966,12 @@ impl TomlTarget {
         match self.name {
             Some(ref name) => {
                 if name.trim().is_empty() {
-                    Err(human(format!("test target names cannot be empty")))
+                    Err(human("test target names cannot be empty".to_string()))
                 } else {
                     Ok(())
                 }
             },
-            None => Err(human(format!("test target test.name is required")))
+            None => Err(human("test target test.name is required".to_string()))
         }
     }
 
@@ -979,12 +979,12 @@ impl TomlTarget {
         match self.name {
             Some(ref name) => {
                 if name.trim().is_empty() {
-                    Err(human(format!("bench target names cannot be empty")))
+                    Err(human("bench target names cannot be empty".to_string()))
                 } else {
                     Ok(())
                 }
             },
-            None => Err(human(format!("bench target bench.name is required")))
+            None => Err(human("bench target bench.name is required".to_string()))
         }
     }
 }
-- 
2.30.2